diff --git a/system/codeigniter/Base4.php b/system/core/Base4.php
similarity index 100%
rename from system/codeigniter/Base4.php
rename to system/core/Base4.php
diff --git a/system/codeigniter/Base5.php b/system/core/Base5.php
similarity index 100%
rename from system/codeigniter/Base5.php
rename to system/core/Base5.php
diff --git a/system/libraries/Benchmark.php b/system/core/Benchmark.php
similarity index 100%
rename from system/libraries/Benchmark.php
rename to system/core/Benchmark.php
diff --git a/system/codeigniter/CodeIgniter.php b/system/core/CodeIgniter.php
similarity index 100%
rename from system/codeigniter/CodeIgniter.php
rename to system/core/CodeIgniter.php
diff --git a/system/codeigniter/Common.php b/system/core/Common.php
similarity index 100%
rename from system/codeigniter/Common.php
rename to system/core/Common.php
diff --git a/system/codeigniter/Compat.php b/system/core/Compat.php
similarity index 100%
rename from system/codeigniter/Compat.php
rename to system/core/Compat.php
diff --git a/system/libraries/Config.php b/system/core/Config.php
similarity index 100%
rename from system/libraries/Config.php
rename to system/core/Config.php
diff --git a/system/libraries/Controller.php b/system/core/Controller.php
similarity index 100%
rename from system/libraries/Controller.php
rename to system/core/Controller.php
diff --git a/system/libraries/Exceptions.php b/system/core/Exceptions.php
similarity index 100%
rename from system/libraries/Exceptions.php
rename to system/core/Exceptions.php
diff --git a/system/libraries/Hooks.php b/system/core/Hooks.php
similarity index 100%
rename from system/libraries/Hooks.php
rename to system/core/Hooks.php
diff --git a/system/libraries/Input.php b/system/core/Input.php
similarity index 100%
rename from system/libraries/Input.php
rename to system/core/Input.php
diff --git a/system/libraries/Language.php b/system/core/Lang.php
similarity index 100%
rename from system/libraries/Language.php
rename to system/core/Lang.php
diff --git a/system/libraries/Loader.php b/system/core/Loader.php
similarity index 100%
rename from system/libraries/Loader.php
rename to system/core/Loader.php
diff --git a/system/libraries/Model.php b/system/core/Model.php
similarity index 100%
rename from system/libraries/Model.php
rename to system/core/Model.php
diff --git a/system/libraries/Output.php b/system/core/Output.php
similarity index 100%
rename from system/libraries/Output.php
rename to system/core/Output.php
diff --git a/system/libraries/Router.php b/system/core/Router.php
similarity index 100%
rename from system/libraries/Router.php
rename to system/core/Router.php
diff --git a/system/libraries/URI.php b/system/core/URI.php
similarity index 100%
rename from system/libraries/URI.php
rename to system/core/URI.php
diff --git a/system/codeigniter/index.html b/system/core/index.html
similarity index 100%
rename from system/codeigniter/index.html
rename to system/core/index.html